[5.1] Backport BAG failover fix. Ignore server provided failover partner.#3704
Merged
mdaigle merged 10 commits intorelease/5.1from Oct 28, 2025
Merged
[5.1] Backport BAG failover fix. Ignore server provided failover partner.#3704mdaigle merged 10 commits intorelease/5.1from
mdaigle merged 10 commits intorelease/5.1from
Conversation
* Add IgnoreServerProvidedFailoverPartner app context switch. * Add behavior skip to netfx. * Consolidate to single property for failover partner value. * Rework checks to preserve server provided value, but ignore it. * Fix import. * Skip server failover partner override in �LoginNoFailover method. Add simulated server test coverage.
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR backports a fix from PR #3625 to the 5.1 branch that addresses Basic Availability Group (BAG) failover issues by adding an option to ignore server-provided failover partners. The implementation adds a new AppContext switch that allows applications to explicitly control failover behavior instead of relying on server-provided values.
Key Changes:
- Introduced
IgnoreServerProvidedFailoverPartnerAppContext switch to control failover partner behavior - Refactored
ServerProvidedFailOverPartnerproperty from a field-backed read-only property to an auto-property with consistent naming - Updated failover logic to conditionally use server-provided values based on the new switch
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| LocalAppContextSwitches.cs | Adds the new IgnoreServerProvidedFailoverPartner switch with documentation |
| SqlInternalConnectionTds.cs (netfx) | Refactors failover partner property and implements conditional logic based on the new switch |
| SqlInternalConnectionTds.cs (netcore) | Same changes as netfx version for .NET Core platform |
| SqlCommand.cs (netfx) | Updates property reference to use corrected naming |
| SqlCommand.cs (netcore) | Updates property reference to use corrected naming |
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Show resolved
Hide resolved
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release/5.1 #3704 +/- ##
===============================================
+ Coverage 71.82% 71.99% +0.16%
===============================================
Files 293 293
Lines 61659 61610 -49
===============================================
+ Hits 44289 44354 +65
+ Misses 17370 17256 -114
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
paulmedynski
requested changes
Oct 21, 2025
Contributor
paulmedynski
left a comment
paulmedynski
left a comment
There was a problem hiding this comment.
I think these changes are risky without the accompanying tests.
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Show resolved
Hide resolved
benrr101
previously approved these changes
Oct 21, 2025
Contributor
benrr101
left a comment
benrr101
left a comment
There was a problem hiding this comment.
Paul's comments are good - Since the overall approval is gated on his, I'll approve.
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
mdaigle
commented
Oct 22, 2025
src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionBasicTests.cs
Show resolved
Hide resolved
Contributor
Author
|
@benrr101 @paulmedynski comments addressed and I backported the test included in the original PR. |
paulmedynski
requested changes
Oct 23, 2025
Contributor
paulmedynski
left a comment
paulmedynski
left a comment
There was a problem hiding this comment.
Asking for one clarification.
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
Show resolved
Hide resolved
paulmedynski
previously approved these changes
Oct 23, 2025
paulmedynski
approved these changes
Oct 24, 2025
benrr101
approved these changes
Oct 28, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backports #3625